Autogenerated HTML docs for v1.5.0-50-gb7581
diff --git a/git-merge.html b/git-merge.html index 34c16de..a851ff1 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -545,7 +545,7 @@ <p> Resolve the conflicts. <tt>git-diff</tt> would report only the conflicting paths because of the above 2. and 3.. Edit the - working tree files into a desirable shape, <tt>git-update-index</tt> + working tree files into a desirable shape, <tt>git-add</tt> or <tt>git-rm</tt> them, to make the index file contain what the merge result should be, and run <tt>git-commit</tt> to commit the result. </p> @@ -570,7 +570,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 13-Feb-2007 05:16:09 UTC +Last updated 18-Feb-2007 00:34:41 UTC </div> </div> </body>
